According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉

I suggest that in the future we shouldn't accept __enter__() methods returning self anymore that don't use a type var.

Yes, and perhaps we can audit the existing ones. git grep 'def __enter__(self) -> [A-Z]' shows a number of candidates.